merge emacs-24
authorKenichi Handa <handa@gnu.org>
Fri, 14 Sep 2012 11:50:54 +0000 (20:50 +0900)
committerKenichi Handa <handa@gnu.org>
Fri, 14 Sep 2012 11:50:54 +0000 (20:50 +0900)
commit34bbf627e3fcf0b15a8cd56ee8c0c15d5c9679a9
tree7b89f5c0e057d47131e26505151b4227b2cda85c
parentce6adfacfbf8b2b43af0bc064462fd45f484417b
parent4cc5c482d1ffc0248a3e5067149a8f94439753ea
merge emacs-24